Make GtkOverlayLayout public

Keeping the layout manager type private does not
really work when it has layout child properties
that need to be usable in ui files.

diff --git a/gtk/gtk.h b/gtk/gtk.h
index 570e362efa5a46b057258d58f1d2be610c87fee9..eba47fb96702954eb1e9e91e6625133d7f752614 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -164,6 +164,7 @@
 #include <gtk/gtknotebook.h>
 #include <gtk/gtkorientable.h>
 #include <gtk/gtkoverlay.h>
+#include <gtk/gtkoverlaylayout.h>
 #include <gtk/gtkpadcontroller.h>
 #include <gtk/gtkpagesetup.h>
 #include <gtk/gtkpaned.h>

diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c
index f790256911671b2bc5d1f5cdfa5d55fea475e411..9444cfd96aa91e1339eabb30bdca1822cb49e755 100644 (file)
--- a/gtk/gtkoverlay.c
+++ b/gtk/gtkoverlay.c
@@ -22,7 +22,7 @@
 
 #include "gtkoverlay.h"
 
-#include "gtkoverlaylayoutprivate.h"
+#include "gtkoverlaylayout.h"
 #include "gtkbuildable.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"

diff --git a/gtk/gtkoverlaylayout.c b/gtk/gtkoverlaylayout.c
index 2e0104f92dde2b95085685b2011af1ba1fb78ab3..54ed06e573de811f6ad2cac361a919d39fc66601 100644 (file)
--- a/gtk/gtkoverlaylayout.c
+++ b/gtk/gtkoverlaylayout.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "gtkoverlaylayoutprivate.h"
+#include "gtkoverlaylayout.h"
 
 #include "gtkintl.h"
 #include "gtklayoutchild.h"

diff --git a/gtk/gtkoverlaylayout.h b/gtk/gtkoverlaylayout.h
new file mode 100644 (file)
index 0000000..1e54060
--- /dev/null
+++ b/gtk/gtkoverlaylayout.h
@@ -0,0 +1,57 @@
+/* gtkoverlaylayout.h: Overlay layout manager
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * Copyright 2019 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <gtk/gtklayoutmanager.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_OVERLAY_LAYOUT (gtk_overlay_layout_get_type ())
+#define GTK_TYPE_OVERLAY_LAYOUT_CHILD (gtk_overlay_layout_child_get_type ())
+
+/* GtkOverlayLayout */
+
+GDK_AVAILABLE_IN_ALL
+G_DECLARE_FINAL_TYPE (GtkOverlayLayout, gtk_overlay_layout, GTK, OVERLAY_LAYOUT, GtkLayoutManager)
+
+GDK_AVAILABLE_IN_ALL
+GtkLayoutManager *      gtk_overlay_layout_new    (void);
+
+/* GtkOverlayLayoutChild */
+
+GDK_AVAILABLE_IN_ALL
+G_DECLARE_FINAL_TYPE (GtkOverlayLayoutChild, gtk_overlay_layout_child, GTK, OVERLAY_LAYOUT_CHILD, GtkLayoutChild)
+
+GDK_AVAILABLE_IN_ALL
+void            gtk_overlay_layout_child_set_measure (GtkOverlayLayoutChild *child,
+                                                      gboolean               measure);
+
+GDK_AVAILABLE_IN_ALL
+gboolean        gtk_overlay_layout_child_get_measure (GtkOverlayLayoutChild *child);
+
+GDK_AVAILABLE_IN_ALL
+void            gtk_overlay_layout_child_set_clip_overlay (GtkOverlayLayoutChild *child,
+                                                           gboolean               clip_overlay);
+
+GDK_AVAILABLE_IN_ALL
+gboolean        gtk_overlay_layout_child_get_clip_overlay (GtkOverlayLayoutChild *child);
+
+G_END_DECLS

diff --git a/gtk/gtkoverlaylayoutprivate.h b/gtk/gtkoverlaylayoutprivate.h
deleted file mode 100644 (file)
index 1e54060..0000000
--- a/gtk/gtkoverlaylayoutprivate.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* gtkoverlaylayout.h: Overlay layout manager
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- *
- * Copyright 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <gtk/gtklayoutmanager.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_OVERLAY_LAYOUT (gtk_overlay_layout_get_type ())
-#define GTK_TYPE_OVERLAY_LAYOUT_CHILD (gtk_overlay_layout_child_get_type ())
-
-/* GtkOverlayLayout */
-
-GDK_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (GtkOverlayLayout, gtk_overlay_layout, GTK, OVERLAY_LAYOUT, GtkLayoutManager)
-
-GDK_AVAILABLE_IN_ALL
-GtkLayoutManager *      gtk_overlay_layout_new    (void);
-
-/* GtkOverlayLayoutChild */
-
-GDK_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (GtkOverlayLayoutChild, gtk_overlay_layout_child, GTK, OVERLAY_LAYOUT_CHILD, GtkLayoutChild)
-
-GDK_AVAILABLE_IN_ALL
-void            gtk_overlay_layout_child_set_measure (GtkOverlayLayoutChild *child,
-                                                      gboolean               measure);
-
-GDK_AVAILABLE_IN_ALL
-gboolean        gtk_overlay_layout_child_get_measure (GtkOverlayLayoutChild *child);
-
-GDK_AVAILABLE_IN_ALL
-void            gtk_overlay_layout_child_set_clip_overlay (GtkOverlayLayoutChild *child,
-                                                           gboolean               clip_overlay);
-
-GDK_AVAILABLE_IN_ALL
-gboolean        gtk_overlay_layout_child_get_clip_overlay (GtkOverlayLayoutChild *child);
-
-G_END_DECLS